-
Notifications
You must be signed in to change notification settings - Fork 2.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Use quoted collation declaration when available, fixes test suite when running against DBAL 2.10+ #7889
Use quoted collation declaration when available, fixes test suite when running against DBAL 2.10+ #7889
Conversation
$this->assertEquals("CREATE TABLE cms_phonenumbers (phonenumber VARCHAR(50) NOT NULL, user_id INT DEFAULT NULL, INDEX IDX_F21F790FA76ED395 (user_id), PRIMARY KEY(phonenumber)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB", $sql[7]); | ||
$collation = $this->getColumnCollationDeclarationSQL('utf8_unicode_ci'); | ||
|
||
$this->assertEquals("CREATE TABLE cms_groups (id INT AUTO_INCREMENT NOT NULL, name VARCHAR(50) NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 $collation ENGINE = InnoDB", $sql[0]); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's hard to see what changed here - could you revert the diff so that the change is more evident, please?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry @Ocramius, I do not understand your request.
The change is related to collation declaration that now depends on the doctrine/dbal version. You can see related DBAL commit: doctrine/dbal@733b64b
What command should I execute to make the change more evident?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, DBAL version-dependant, sorry!
I'd probably request that you bump doctrine/dbal
to ^2.10
in composer.json
, and then (if feasible) we keep the strings constant here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, never mind, I see that this is for 2.6 - no version updates there
8e700fb
to
57d44aa
Compare
57d44aa
to
1bc4e1f
Compare
Thanks @ajgarlag! |
Tests are failing with doctrine/dbal >= 2.10 because column collation declaration in MySQL is being quoted (See: doctrine/dbal@733b64b).